Merge "Fix CC handling for no large object space case"
am: 443dbfcf39

Change-Id: I0c83fe1fbf4249f5fb83f7de04251a607ac9029d