Merge goog/eclair-dev into goog/eclair