Merge "EmergencyNumber enhancement"
am: b158b12cbb

Change-Id: I3493e759d2c5b582b54e6145d0aa8767501f1528