Merge "[Sb refactor] Proper support for carrierNetworkChangeMode" into udc-dev