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

This reverts commit 390b1d2c14b4ddfa2c893a1f1a17ff1c22120e3a.
Rebase from 'upstream'
Trimmed the branch to only the cpp_common sub directory