Merge "Updates more CtsContentTestCases to TEST_MAPPING"