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

This reverts commit e2e26a9b05bf0d197d2ce9ad9057d40c871433fa.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the diagnostic_updater sub directory