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

This reverts commit 8594768c2efce8f08e734ce45470612ecafbd2b4.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the p2os_driver sub directory