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

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