am a2ced3e8: am 8d12d3da: Merge "Only switch user if current user is being...
am a2ced3e8: am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev automerge: eeb43fbd
* commit 'a2ced3e8':
Only switch user if current user is being wiped