Merge "Handle CallStateException in PhoneInterfaceManager." into oc-dev