Merge "recovery: report compliant reboot reason (Part Deux)" am: 5f7314b7e1
am: 789ae60a9d

Change-Id: I8edf9ca91a611dd43a4544505ae98edf3df857aa