Merge "Sorting and merge Emergency number better"
am: 70ed8dba68

Change-Id: Ic04771d79d96affb99876fe92a9768937ea93885