Merge "Ensure staged rollback status is logged on boot" into rvc-dev am: 025b96ee am: 414ad5cf am: 34d5c507 Change-Id: I3a83bf9d9eebb7fadcdd656d2bcecfd3e6881a92