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

This reverts commit dc3a7fe83af0e89198f317f93278437d409c06db.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the diagnostic_common_diagnostics sub directory