Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9
am: 11e9af909d

Change-Id: Ib07bb356ac6fac309716e76b2d9d4b1581518cdf