Merge "Ensure staged rollback status is logged on boot" into rvc-dev am: 025b96ee am: 414ad5cf am: 5545b92c am: 2a6327f8 Change-Id: I15d1740803defe97ca1183ecd6490487c65edcc0