Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" am: c4321c7e6c  -s ours am: 142193550e  -s ours
am: 994779c61e  -s ours

* commit '994779c61ef1d6b87aa98ee48c61ecc8410d0295':
  [DO NOT MERGE] Modify system settings: incorrect UI state