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