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

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