Merge change 26254 into eclair

* changes:
  fix bug 2134685: fix tests for PhoneNumberUtilsTest.