Merge change 26991 into eclair

* changes:
  Add null check at isEmergencyNumber().