change up some gps files

Change-Id: I47e0a5598799b1ae75438251cd6d8c8a23da7c54
Merge commit '63b39fa8af' into ics