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

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