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

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