Merge normalizeTargets and normalizeSpamList together

Change-Id: I9bd829018fb9585518f480e8901f919b63ea16d3
Merge "Merge normalizeTargets and normalizeSpamList together"