Merge "Remove the Google specific location config." into jb-mr1-dev