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

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