Merge "Cleanup for local variable in test_attach_volume"