Merge "DO NOT MERGE: CDD Annotations for Section 3.8.3" into oreo-mr1-cts-dev