am a2ced3e8: am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev automerge: eeb43fb

* commit 'a2ced3e879458786edf715a0016293791db7fd65':
  Only switch user if current user is being wiped