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

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