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

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