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

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