am 4413034b: am f1dd6120: am 07458abe: am cca28d2b: am 25ab29d6: am fe5e1f6b: Revert "Remove the Google specific location config."

* commit '4413034b271de1392f5d46f598900bd2bf4154aa':