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

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