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

This reverts commit 16d9849f6f4dafb28f5df8e4271f62f187a683fb.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rtmros_hironx sub directory