Merge "Fix monkey crash" into oc-dev
am: c01dd791c3

Change-Id: I67f19cb80671166826e97e3e2470037b426500c4