Merge "Switch to use RefactoredBackupManagerService"