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

This reverts commit d0469c3837751806c9b545669850959573f10949.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rtmros_hironx sub directory