Merge "Emergency Number format"
am: e5709bf75f

Change-Id: I335cd4ebe8974915f0af1162bdca42029b3afb98