gps: Updates from mr1 branch

Change-Id: I3ac7bc30601b464c4100f9c88c4c2cc333b131b8