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

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