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

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