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

This reverts commit 2ff37d0a8b8496ab3bbfd387af8728f4da0f1591.
Rebase from 'upstream'
Trimmed the branch to only the rtmros_hironx sub directory