Merge "Update test_mapping to point to test suite vs class" into rvc-dev am: 4fd9b75e52 am: d4bc5d32ea

Change-Id: Icdad941c26c93697c4dad122cca7db62e9e341c2