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

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