am 0d7ae0ed: Fix a monkey crash.

Merge commit '0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8'

* commit '0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8':
  Fix a monkey crash.