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

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