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