Merge 0bf89272acabea99cd04e0b087d1c50ccb44138f on remote branch

Change-Id: I290cc8729bf91f851cd98882fe4ca93bc398f132
tree: e21a512fee75b098efbdf4324d7fbf9e6caa7ed3
  1. iconloaderlib/