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

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