Merge change 22499 into eclair

* changes:
  Use new API for resolving Email addresses.