Merge "Handle Telecom binder death." into oc-mr1-dev