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

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