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

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