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

Change-Id: Ie04d61745fa7973fa0e1ccf653e54f4b2f6c3efe