Merge "DO NOT MERGE Remove remaining references to repeat and shuffle APIs" into nyc-support-25.1-dev