Merge changes from topic "apply_promoted_emergency_numbers" am: 38aaf2e16d am: 7ce5521f9e
am: 695b34c73c

Change-Id: Ie0e6b09908e633ef697eb3d041005b89fb68b5ce