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

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