Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2