Merge commit 'goog/master' into eclair-release