Merge "Fix smoke tests to delete resources synchronously."