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

This reverts commit 93127261d07c1d0c6e2af191f1659cb04c649a3c.
Rebase from 'upstream'
Trimmed the branch to only the diagnostic_updater sub directory