am a5c371bf: Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0

* commit 'a5c371bf1fc878f84c296a63839a5d031dea843f':
  Bug 5275928 - Invasion of the monkeys