Merge "Fix logic error in CarrierService." into mnc-dev