Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotation for section 3.4" into oreo-cts-dev am: 028687b036  -s ours" into oreo-mr1-cts-dev