am f538671a: am add06492: Fix monkey crash.

Merge commit 'f538671a72de1d23999cd41763857db129a9e5d2'

* commit 'f538671a72de1d23999cd41763857db129a9e5d2':
  Fix monkey crash.