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

Change-Id: Id8f136f5b94c7788d5b1083812690840a8d458d5