Merge "Hide CarrierMessagingServiceWrapper for now." into rvc-dev