Merge commit 'goog/master' into merge2master