Fix entries for Khai Do, Chris Jones and Jim Blair

Change-Id: I2bcfe4839de1d1076f8f2cd7ea42593039b8fa5e
Merge "Fix entries for Khai Do, Chris Jones and Jim Blair"