Merge "Bump containerd to 1.2.5"