Merge "Update etcd version to 3.3.12"