Merge "Remove old BackupManagerService"