Merge "Ensure staged rollback status is logged on boot" into rvc-dev am: 025b96ee57 am: 414ad5cff8 am: 5545b92c4f

Change-Id: I7d846ee086d692013fd2093e3f12481ea9f423ee