Yup, that’s him.
No, that was Geoffrey Holder. Yaphet Kotto played Mr. Big /Dr. Kananga. He also was in The Running Man.