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

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