Merge "Split resource_setup for database tests"