Merge "[CDM] Remove userId from SystemDataTransferRequest xml" into main