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

Change-Id: I8ec2a39dcb456887720ade59e9fffe059d79c389