[No reviewer] Updates to cpp-common