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

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