am 9117f34b: am 7b3550c0: am 435a1dfb: Merge "Fix weird case of multi cell icons" into mnc-dev

* commit '9117f34bea08c3166a5eda636226a16d6a5fe232':
  Fix weird case of multi cell icons