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

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