Merge "Update test_mapping to point to test suite vs class" into rvc-dev am: 4fd9b75e am: d4bc5d32 am: cdd3d508 Change-Id: Ied14758a51e8f8bce8ccc517fe90de443562977e