Merge "Update carrier text when phone service state is changed" into oc-dev