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

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