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

Change-Id: I08543c8a8c26008056c0cd23e828668af50821c5