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

This reverts commit d4504405f201afba6359f89279a9166b3f243314.
Rebase from 'upstream'
Trimmed the branch to only the rosh sub directory