Merge "Different messages when wiping user and not device" into lmp-mr1-dev