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

* commit 'e5634164a0e89568cd79868e6bdcbc5610dc78ea':
  Cache call type icons

Change-Id: I861b544cf648fe7b48f827fcfce5807359ddecc9