Merge "Don't enable rollback again in pre-reboot verification"