Merge "modify QZSS SVID according to NMEA spec 4.11"