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

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