am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev

* commit 'f57fcddb61236c6e9c145d8f310bf1f4b1daafbb':
  First step towards cleaning up Global settings.