merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD