Merge "Add Monkey protection" into ics-mr1