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

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