Merge "Restructure CarrierMessagingServiceWrapper with better interfaces."