am 049ccb55: am 0d4fd237: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev

* commit '049ccb55361de3ef41b01875569b341c4f06d1db':
  More migration to Global settings.