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

Change-Id: Iebd2c9322dfb5113b21410fa3e60af2321ba7e9d