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

Change-Id: I593eeaabf0f3c44c83d1a516dc05518dbfdd3660