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

Change-Id: Iadcde91484f5942c5f9fa0b9c4f4defca1d06172