Merge "Fixed the issue that unknown contact sort" am: 4ed9805ba3 am: 7f539c63f5
am: 9a8d0484df

Change-Id: I70141444a884ac93391b4ffab62e85302e6b3c4e