am a42d2780: am a9dca98e: am f6351ece: Merge "Mmm mmm mmm mmm." into mnc-dev

* commit 'a42d27804e958524c60b2741635c236616db9a36':
  Mmm mmm mmm mmm.