Merge "Address API feedback for BackupRestoreEventLogger" into udc-dev