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

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