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