Merge "DO NOT MERGE: CDD Annotation For Section 7.5" into oreo-cts-dev