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

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