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

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