Merge "[automerger skipped] Merge "DO NOT MERGE: CDD annotations for Section 3.9" into oreo-mr1-cts-dev am: da965cea82  -s ours" into pie-cts-dev