Merge "Fix monkey crash" into jb-mr2-dev