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

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