Merge change 24086 into eclair

* changes:
  Fixing asymmetry between phone filter and email filter APIs.