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

Merge commit '7f86d58f179085f5101fcce154fcd510b2a81089'

* commit '7f86d58f179085f5101fcce154fcd510b2a81089':