Merge "Modify emergency number detection"