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

Change-Id: I7d9cfbf85502c30c0f7608eebb9315bbb24d1f65
tree: 8fd03166731e4b2909aff4fb7776a55588283b2d
  1. tests/