Merge "Add proxy for BackupManager" into tm-qpr-dev