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

* commit '3a8af8efff93ca8ee80fc8c7841e7bee9a8b7786':
  Migrate more Secure settings to Global.