am d96abecc: am 02bc3ffe: am 1e78bd01: Merge "Observer for GPS is never added back."

* commit 'd96abeccfd04de5a89599d2b041022bef9e58669':
  Observer for GPS is never added back.