Merge "Fix some typos in NMS." into udc-dev