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

This reverts commit 32c88a5bb8cddb893b4e2f13aecea29e178e383c.
Rebase from 'upstream'
Trimmed the branch to only the ros sub directory