trying cm-gps again

Change-Id: Id8f11f88cfba81372beb05a44e104c00c235101b