[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: I1e6beb21e5920b6ab96d917919665f426f6d4c2a
tree: 4d4b47cf1aadc3869fc00cb5245515321a37484c
  1. tests/