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

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