Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD(8.1) Annotations for section 7.4." into oreo-cts-dev am: 257fc453c7  -s ours" into oreo-mr1-cts-dev am: 132bfe1b8f  -s ours" into pie-cts-dev
am: e31b392b81  -s ours

Change-Id: I781051c2a7a277b26348b2154652aee1c47740fe