Merge "Monkey proofing" into ics-mr1