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

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