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

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