am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev

* commit '65f4de101fa8d5752603c6e79536c3a17f585490':
  Migrate more Secure settings to Global.