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

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