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

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