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

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