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

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