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

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