Merge "Remove BackupManagerServiceInterface"