Merge "Implement SpamPhoneLookup" am: 70ebcc7cd0
am: c98b1924f5

Change-Id: I17a842bdc6393a302ddec32d507979c339e866ef