am 2d018a8b: am 07841668: Merge "Move Google-apps specific location settings...
am 2d018a8b: am 07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
* commit '2d018a8b':
Move Google-apps specific location settings to a Google package