Merge "Show wipe data confirmation text in recovery mode" am: c456aab7e2 am: 608acc9ca2
am: 9d59cecdf9

Change-Id: I7d67ab6601b3756ef59ca034446d2fa27ed125af