Merge "DO NOT MERGE: CDD Annotation for section 3.10" into oreo-cts-dev