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

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