Merge "[automerger skipped] Merge "Sorting and merge Emergency number better" am: 70ed8dba68 am: 22f7e515c5 -s ours am: 617cd55e77 -s ours am skip reason: change_id I64a43886d4000b261ea703b081e6278b0307805f with SHA1 a1f21a5c2c is in history"