Merge "Fix incorrect matching of last character to unexpected names in contact dictionary."