Merge "DO NOT MERGE: CDD Annotation for Section 7.9" into oreo-mr1-cts-dev