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

This reverts commit d758428eac52d95ea36519f51814864847c29a34.
Rebase from 'upstream'
Trimmed the branch to only the rtmros_hironx sub directory