Merge "Don't crash from null ServiceState in cdma" into oc-mr1-dev