am 4caac2bb: Merge change 7140 into donut

Merge commit '4caac2bb4c8616edf8224408931ffc0e532537de'

* commit '4caac2bb4c8616edf8224408931ffc0e532537de':
  Add more logging to track down a monkey bug