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

Change-Id: Iaec555012fd4b4740a9d67ffb9e6ece5e3457bfa