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