Merge "Move Google-apps specific location settings to a Google package" into jb-dev