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

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