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

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