[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section 4" into oreo-mr1-cts-dev
am: ea242b1fb3  -s ours

Change-Id: I110e636cfedf26212beb0bde072c920a34f60804