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

This reverts commit fcda52398ff1d6483f63d5c3e088d8b77cbf0d9f.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the cpp_common sub directory