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

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