[automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am:...
[automerger skipped] Merge "Add test prefix into test cases" into rvc-dev am: 2fe71270 -s ours am: 96ad8765 -s ours am: 88a9efe3 -s ours
am skip reason: Change-Id I6e18915e383ac20072cb238d0136d7a8e4ceb811 with SHA-1 45016505 is in history
Change-Id: I600daca81f430b97b4d56b7a9769000be16b3b8e