Merge "Split resource_setup for messaging tests"