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

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