Merge "Revert "recovery: report compliant reboot reason""