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

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