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

This reverts commit 2aa9caf31f7c64868b36e92dab6976f3566fe1cf.
Rebase from 'upstream'
Trimmed the branch to only the rtmros_nextage sub directory