[No reviewer]  cpp-common update