Merge changes from topic "def-tool-loadlib"
am: 6151e1a1ad

Change-Id: I6788a3594604bb31af015bf30482d5b21eebeceb