Update SpamBlacklist, emergency revert

Change-Id: If2d808deb5267ba14930fa3438a01860a1b091b2