Merge "DO NOT MERGE: CDD annotations for Section 3.9" into oreo-mr1-cts-dev