Merge "Add Emergency Call Routing"
am: 7b490e3810

Change-Id: I0294353b23f65f2f6a324b51368d3b22c146979a