Merge "Fix two NPEs in TelephonyConnection" into oc-mr1-dev