am e686e0f1: Merge "Fix DeadObjectException when bind fails." into klp-dev

* commit 'e686e0f12e85d64626fea969848cf2396263e8f6':
  Fix DeadObjectException when bind fails.