Merge "DO NOT MERGE: CDD annotations for section 3.8.3.3" into oreo-mr1-cts-dev