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

Change-Id: I1a57bda32c15b0cfb2e0c6b1a74870501b15c10d