Merge "DO NOT MERGE: CDD annotation for section 3.12" into oreo-cts-dev