am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not...
am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev
* commit '108bdbc9':
Different messages when wiping user and not device