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

This reverts commit 2b3a6872619a4d7b3934bb5d787cad268191da39.
Rebase from 'upstream'
Trimmed the branch to only the rosh_common sub directory