Merge "Fix occasional PRH test failures"