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

This reverts commit bf11907e15388c3e4c76a9314bf3499e34f1f283.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the cpp_common sub directory