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

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