Merge RP1A.200417.001

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