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

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