Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotation for Section 5.4" into oreo-cts-dev am: de66081c97  -s ours" into oreo-mr1-cts-dev am: 974f97ab85  -s ours"
am: bc4c5961b7  -s ours

Change-Id: I5a87dbb7ee3779ed0676e9cf0d6e89a119db88cf