Merge "Update test using FullBackupDataOutput private ctor" into oc-dev