Update GPS configuration to current standards.

Change-Id: I806c14fa66b25e97eadd70e1ccf41c2393b4c53d
Merge remote-tracking branch 'cm/cm-11.0' into HEAD