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

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