Update SpamBlacklist, emergency revert

Change-Id: Ic0e9bb7075d7376ff9f4851d2535c1ac7693f3c3