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

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