Merge 86c14e69bcabefae3966a4de73681ea0f6de09d8 on remote branch

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