am d451b872: (-s ours) am c1a1aa1e: deal with gps renaming

Merge commit 'd451b872babde2f97da08ba27d60e18643b76f0a'

* commit 'd451b872babde2f97da08ba27d60e18643b76f0a':
  deal with gps renaming