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

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