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

* commit '1fbc1b3b4b742cdba25d32d65a9813933a37005f':
  Fix partial user cleanup on restart