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

Change-Id: I9c6349598dd67128b5cc5241218dd469de5c767a