Merge commit 'remotes/goog/eclair' into eclair-release