Merge pull request #16009 from jmcclelland/import-match-phone