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

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