Merge "Disable test causing oom failures." into rvc-dev