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

This reverts commit 362c253af983ea9a297ab4f2b2c2984b2a556d26.
Rebase from 'upstream'
Trimmed the branch to only the sr_self_test sub directory