Merge changes from topic "wipe"
am: ac80c040c1

Change-Id: I3c821057313f2d09fb82d3999eb08e0143b841f6