[automerger skipped] Merge "Replace generic GC type flag with a specific Generational CC flag." am: 77ad6aee15 am: 2c2a2774d5
am: 7553f7ebef -s ours
am skip reason: change_id I30a73171c0dc3c7bc891c4f164eed0ba42b0f420 with SHA1 72b16f0ad0 is in history

Change-Id: Ibbe1f5a8db45eaedd8a7c48145ac88b1ae4e3cc6