Merge change 26127 into eclair

* changes:
  Uri encode phone number before passing it to query.