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

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