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

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