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

This reverts commit 5bb119c7b6f0586234ea6d4258ff6f7c3d24b810.
Rebase from 'upstream'
Trimmed the branch to only the sr_ronex_test sub directory