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 am: 97d376e604  -s ours
am: 9f1e49f5cc  -s ours

Change-Id: I47c2c4c63aedb5d848449272f900df619a49ed2c