Merge "Experimental Sticky-Bit (Generational) CC collection"
am: d9205b8481

Change-Id: Id8264cd85d4aa0b39df73f05d3310eebf3ea7718