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