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

Change-Id: Ib7b83c910e11fd5fe1e4af7f0d43d309c1333f4f