[automerger skipped] Merge "Annotated Cts Tests with CDD Sections 7.9.2/7.1.4.2/7.1.4.1" into oc-mr1-dev am: a497c48c0c  -s ours
am: 02da950b4e  -s ours

Change-Id: I371a06bfd469d42149ff7c3dda6e70bb7bf905b3