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

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