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

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