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

This reverts commit cb4dd6ea107eedfad68c3a1307afb29a5ae627bd.
Rebase from 'upstream'
Trimmed the branch to only the driver_base sub directory