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

This reverts commit e95c4178be2104c8f0c2a130a264a9e6b3e4e6f2.
Rebase from 'upstream' @ version '1.6.5'
Trimmed the branch to only the driver_base sub directory