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: 2b677421 am: fb17e9da am: 90dfbcf2
Change-Id: If76fc1e4816b43129530534eb27da67788ae7cb6