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

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