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

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