am d4543c51: Merge change 20108 into donut

Merge commit 'd4543c519b7724841eb77bb57ff360e6c40cd69a'

* commit 'd4543c519b7724841eb77bb57ff360e6c40cd69a':
  Guard against remote process dying when retrieving column from cursor.