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

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