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

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