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

* commit '83d13261badfbc03225e729291543759460cb4a8':
  Cache call type icons

Change-Id: Ib32a5dc8a0f41bcf12b3b62d150324a63a826d92