am e89fec34: Merge commit \'goog/eclair\' into eclair-release

Merge commit 'e89fec340c15da38f6e7e9a9cceccd0734fb16eb'

* commit 'e89fec340c15da38f6e7e9a9cceccd0734fb16eb':