Merge "Strip emergency number"
am: 9352f98d37

Change-Id: I035982738d97b973b196491ce99dc28b6d9606ac