Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev