Merge commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88' * commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88': Cosmetic cleanups to SMSDispatcher classes.
Merge commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88' * commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88': Cosmetic cleanups to SMSDispatcher classes.