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

Change-Id: Ic2eef776e44119eb9e26f85fc4f9fef5417050eb