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

Change-Id: I7100220f3cafd6f7fb0865388e496796606c5372