Merge "Revert "recovery: report compliant reboot reason"" am: 44f6b182dd am: b491496fc3
am: 863c8f36dd

Change-Id: Ic736642d61adb472aa1b4984cc8e335f5c8d7207