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

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