am a48621be: Merge "Monkey season" into ics-mr1

* commit 'a48621be8a537284f37b843388b30017b0cfce51':
  Monkey season