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

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