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

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