Merge change 26550 into eclair

* changes:
  fix bug 2134367: failing phone number compare test.