de-duplicate spam filter calling code

Change-Id: I3e1ff4ff24c1a0e89673ea421359c5703e062ab0
Merge "de-duplicate spam filter calling code"