Merge "Remove interface for Rollback and Rollback Boot."