am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev

* commit 'bc3695c231a5a16f45059e0e561a35d49353afc5':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...