Merge "Optimize the resource creation and status waiting in scenario tests"