am 8ece3445: Merge change 8061 into donut

Merge commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd'

* commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd':
  Throw a connecting exception when timed out.