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

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