am a01cbee5: am 0bb87fe9: Merge "Signal client thread in error cases."

* commit 'a01cbee5f2b1457d7a4ce4848bf341dc2eccd5f6':
  Signal client thread in error cases.