DO NOT MERGE Temporarily remove repeat and shuffle API usages

Change-Id: I66b7d745a70de2826df5aaf16871f957c0b7bf49
9 files changed