am da57856d: Add logging to help track down intermittent bug

Merge commit 'da57856d749457e495bd860c4ff45aaaf87c9dab'

* commit 'da57856d749457e495bd860c4ff45aaaf87c9dab':
  Add logging to help track down intermittent bug