am 6b927133: am f0c6d3af: am d0310dab: Merge "Persist user enable/disable setting through reboot." into mnc-dev

* commit '6b927133432b1a4307d2c4d86ca7f0efa0b3a7e3':
  Persist user enable/disable setting through reboot.