Merge changes from topic "add_faster_emergency_dialer_flag"
am: 6055136b06

Change-Id: I539847baa85d65050863dc435ac10569c925e9b3