Merge commit 'goog/eclair' into eclair-release