Merge "Cache call type icons" into nyc-dev am: e5634164a0
am: 9bb027e7dc

* commit '9bb027e7dc557645b87a02981dd794f6267fa4b1':
  Cache call type icons

Change-Id: If1882002b80b05a4559e1f1ab2f2142a3a4cae6b