Revert "Trimmed the branch to only the driver_base sub directory"

This reverts commit 8a7489c2baf5b3be8e236205eeeb6243c9ed34bc.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the driver_base sub directory