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

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