Merge "Report non-empty system boot reason when bootloader reason is empty"
am: 92820c2676

Change-Id: Ic097bc9828d3727915e0c2e1ae53fb4a25bf5171