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

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