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

Change-Id: Id9ce01b3e9b01405ed62b52f340c38f8d61486b8