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

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