Merge "Clean up wait_for_resource_deletion message"