[automerger skipped] Merge "DO NOT MERGE:CDD annotations 3.2.3.4" into pie-cts-dev
am: cf897d7818 -s ours
am skip reason: subject contains skip directive

Change-Id: I54b17fd3aadacf22b940bbbbad13f89cc69c1d1b