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

Change-Id: I8125227e255af2b4944caece1489810328c32bc7