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

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