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

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