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

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