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

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