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

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