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

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