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

* commit '07458abe8e1ada79b1e52f696722af592260ad80':