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

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