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

This reverts commit 3499e11ee42cb74a8056dc1c4f42ca8b6f2eaa40.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the sr_self_test sub directory