Merge "Handle Telecom binder death." into oc-mr1-dev am: 6908075d84
am: 0fc9b83faa

Change-Id: Ic2567409fef18a8546b98f7be32cc3292ec6cd93