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

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