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

* commit '3ad53f765efe4e0298255b6b13d75a963270407c':
  Fix partial user cleanup on restart