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

* commit '91e928cffb0ac82849dd89e7251e04dbb3b9a697':
  Cache call type icons

Change-Id: I2229d2c103ae0da8bbcf194ac328f28d193be055