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

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