Merge changes from topic "apply_promoted_emergency_numbers"
am: 38aaf2e16d

Change-Id: I5f35cd39ef8d0e66b060ebe7dd32607720dccc20