Merge "recovery: report compliant reboot reason (Part Deux)" am: c0a51a01ce am: 7d0545f14a
am: 3447708800

Change-Id: I564c87f50d3a4a8ad6a26a16e96586e2ef235ca5