(MediaCore Review) Self-review, intermittent test failure fix