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

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