Merge "Make SmsHelper local to Assistant rather than a singleton (I accidentally forgot to include this piece in my previous CL it looks like)."