am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev

* commit 'c12dd973724f5aab44814b31650b4b47314e952b':
  Migrate more System and Secure settings to Global.