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

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