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

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