Merge "Remove never-used dead code from BackupManager"