Merge change I808651dc into eclair-mr2

* changes:
  bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().