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

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