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

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