Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread