Merge "Encapsulate RefactoredBackupManagerService fields."