Merge change 25940 into eclair

* changes:
  Use strict phone number comparation algorithm if the config tells the package to do so.