Merge "Hide CarrierMessagingServiceWrapper for now."