Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD annotation for section 3.12" into oreo-cts-dev am: 7cf58683cf  -s ours" into oreo-mr1-cts-dev am: 2b88fb156e  -s ours"