am 1cf3fea6: am 01d53167: Revert "Remove the Google specific location config."

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