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

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