Merge "Fixed the issue that unknown contact sort"
am: 4ed9805ba3

Change-Id: Ia172f9978b1f3cd9a6b67afb985e666f52776d45