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

Change-Id: Ia6d971f51e6fa294392b7283014642c45f17136a