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

Change-Id: I49e21a259ba6009caa5307e4d3e9b394fde4f25b