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

This reverts commit 66c1cdf2f7afcc3aa8ef10493e4ac6ccd4fd0485.
Rebase from 'upstream'
Trimmed the branch to only the cpp_common sub directory