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

Change-Id: I30207a3162d375a57b69ff362d9c3c40cde0d9ff