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

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