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

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