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

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