am 85b3d034: am 1fbc1b3b: Merge "Fix partial user cleanup on restart" into mnc-dev

* commit '85b3d0347955d7244f7d5b89f80482a73e70a0ed':
  Fix partial user cleanup on restart