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

This reverts commit a1b70aace8455b7f63b0935c7bea956e9bf6fbd2.
Rebase from 'upstream' @ version '0.3.12'
Trimmed the branch to only the cpp_common sub directory