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

This reverts commit f1ae07699a5777f3d13b922b8a1c088a6eedb9e9.
Rebase from 'upstream'
Trimmed the branch to only the diagnostic_common_diagnostics sub directory