Merge "EmergencyNumber enhancement" am: b158b12cbb
am: 8af07a9e24

Change-Id: I17931c9ef06a9e192a6c7f7c28563045daf37e2d