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

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