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

This reverts commit 5789841c2880594d3fb4fc4c61dd8cd1f20b34b1.
Rebase from 'upstream'
Trimmed the branch to only the diagnostic_aggregator sub directory