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

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