Merge "Strip emergency number" am: 9352f98d37 am: ad009b7493
am: bf3594388a

Change-Id: Ie22f7035c473517f4049268bf22573f4db820af4