Merge "Remove filter on primary-device from TEST_MAPPING"