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

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