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

This reverts commit bed23091654c95d4713b63ce6faf9e0ec72cf376.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rtmros_hironx sub directory