Merge "Fix CC handling for no large object space case"