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

This reverts commit 1dd3d3327d8d4e7648b9310b9a0c2bb4783ef890.
Rebase from 'upstream'
Trimmed the branch to only the rtmros_hironx sub directory