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

This reverts commit 5726195c101aa8c5e8de7029ec329ce846eb24ba.
Rebase from 'upstream'
Trimmed the branch to only the test_diagnostic_aggregator sub directory