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

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