Merge "Convert ICarrierService to oneway." into oc-mr1-dev