Merge "Mapping up/down of legacy Gps vs. Gnss Status" into nyc-dev