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

Change-Id: Icbb92dde1792520798f39db7209b5fd672b843c2