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

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