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

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