Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev