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

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