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

This reverts commit 46e77bbec8766d92c3efb6106af5c11e505ca00e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the sr_self_test sub directory