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

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