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

Change-Id: Ib73ec12ef68bf23041d009cc30fa7aad20b59c42