Merge "Finalized GPS=>GNSS changes with documents" into nyc-dev