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

Change-Id: I2da6f431a80fe82070fdd2e1c87c027c81d9bf53