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

This reverts commit e9ed069bcbff068ddcaf1addb024d3052c2782ce.
Rebase from 'upstream'
Trimmed the branch to only the rosh_core sub directory