am ea08a01a: am 0536bfef: Merge "Remove the Google specific location config." into jb-mr1-dev

* commit 'ea08a01a326f9e717e07c599c00a55397679893e':
  Remove the Google specific location config.