feaa563a63
Merge commit '8544a349837596ff8889abf3f564c35bb5a1c51a' * commit '8544a349837596ff8889abf3f564c35bb5a1c51a': Fixing asymmetry between phone filter and email filter APIs.