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

Change-Id: Ia99828b09cf3a67d23e1ecb74cf961853314b4a8