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

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