Merge "Split resource_setup for thirdparty tests"