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

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