am a89899a3: am 548f4d6c: am 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev

* commit 'a89899a3241008679cf1c37651ea8bf9adc65ecd':
  Icon: a clean, parcelable place for images.