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