Merge "2-phase full-heap CC"
am: 41622e3abf

Change-Id: I23f2879340d8723f809d041142c04f83ff1648ab