Merge 84c81e99a8ece34cd27afd91307778db7b0c2901 on remote branch

Change-Id: I8d31a20a15b5cbf0db4290429d877b84e83cb947
tree: cdf5719f018b25dbf47373148805c0419ecb6395
  1. iconloaderlib/