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

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