[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
am: 9ff14efadb  -s ours

Change-Id: I1875664eed9a166c58fa61f64ec615a81ff28073