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

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