[No reviewer required] Update to use latest cpp-common