am add06492: Fix monkey crash.

Merge commit 'add0649249b57e025e9d7d26f1ae16f3c0bfb3ce' into gingerbread-plus-aosp

* commit 'add0649249b57e025e9d7d26f1ae16f3c0bfb3ce':
  Fix monkey crash.