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

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