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

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