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

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