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

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