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

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