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

Change-Id: I567fe91628cbf3a491e8f13164ed7ecc6b961333