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

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