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

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