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

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