Merge "Update Spam module to use Dagger" am: 04e88264e6
am: 5f76ac1a9e

Change-Id: Ibb8684212308e5e81245c551ab982430a4fc1335