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

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