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

* commit '0d4fd237ea6040b3ca147addcf097fb283cf3af6':
  More migration to Global settings.