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

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