Merge "Trigger the logging when prompting for wipe." am: 49dc0fed26 am: cda59a70f2
am: ad5d337832

Change-Id: I3f672481bb1057153bc35c3b9c472972f2c35e34