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

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