merge from open-source master
Jean-Baptiste Queru authored
Merge commit 'goog/stage-korg-master' into HEAD
2962397a