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

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