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

This reverts commit c65317cd9ea9c7fa54a2c05a4b8a772a53bc8f0b.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rosh sub directory