Merge "Revert "Expand HDS API to allow egressing training data"" into main