Merge "Make BackupManager encryption aware." into nyc-dev