Merge "Change format emergency number test mode" am: 7e69391c8a
am: 74d5294b9b

Change-Id: Ib86c16516aa4849d3b12270ed62b41e12f2bb992