Merge "Update test_mapping to point to test suite vs class" into rvc-dev am:...
Merge "Update test_mapping to point to test suite vs class" into rvc-dev am: 4fd9b75e am: d4bc5d32 am: 0e575ded am: ca9f1926
Change-Id: Icd762f7c9b8a531dd76ec09c51c5aa0e1bcb71ff