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

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