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

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