am 72bf615b: am a51d6fe9: Fix monkey NPE.

Merge commit '72bf615b2f2d67652c98dbeaa68281db508e36f7'

* commit '72bf615b2f2d67652c98dbeaa68281db508e36f7':
  Fix monkey NPE.