Merge changes from topic "add_faster_emergency_dialer_flag" am: 6055136b06
am: 4d00c818d7

Change-Id: Id6cebad2102783dbe2f6d3afe3336f06d93176b3