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

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