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: Idf7e5bde2a5a43020e9cb2676950f29d836fab16