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

Change-Id: I14e73d71ceb8d50ba7d41040e5b95a51cf8dc735