[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

Change-Id: I48f343a5b67c8ab967b849909dc52752231f1436