Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations For section 8.4" into oreo-cts-dev am: 748688e173  -s ours" into oreo-mr1-cts-dev
am: 925ad47285  -s ours

Change-Id: Ibf8874d1c8a8fe9e44f7da365ba6db3c8fc3993c