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

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