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

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