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

This reverts commit 52b304bdc2aa5401712198ac207b7fc8bd9a0739.
Rebase from 'upstream'
Trimmed the branch to only the sr_gui_self_test sub directory