Merge changes from topic "toolbox-modprobe" am: b02f9b549c am: c4e5646b35
am: eb93de8350

Change-Id: I43d118a9af46a175065842dfaee8f54964acef7a