Merge "Correct policy action for attach/detach volume actions"