Merge "Bump Calico to v3.3.2"