am fbc9ea80: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'fbc9ea8046cad34b58ad727ce6045e3e15069502':
  Revert "Remove the Google specific location config."