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

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