Merge "Potential fix for monkey crash." into ics-mr1