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

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