Merge "Fix incorrect type cast of Carrier preference." into oc-mr1-dev