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

Change-Id: Id9250345b4b7c8caecad919b91a88a64042acdd8