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

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