[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into pie-cts-dev
am: 9709b60914 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4a66d08a162dc0685b0ad5dd08d63be9705a39d
tree: 8f641d434ca5178e1324df12e46e60322ceb9992
  1. tests/