am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev

* commit '1e364acac6f4768672deb73485e93c32929e25fd':
  Actually move to Global settings.
tree: f0c878ef96e7bfb9e442d1b446d83c68db03afb3
  1. core/
  2. services/