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

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