Merge change 21754 into eclair

* changes:
  E911 call fix in ECM