Merge "Suppress large test that always times-out"