Merge "DO NOT MERGE: CDD Annotations For section 8.4" into oreo-cts-dev