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

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