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

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