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

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