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

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