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

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