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

This reverts commit 0c38a6223d5f4784a7bd92d0ac0a44002aab874c.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the diagnostic_aggregator sub directory