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

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