Merge "Merge remote branch 'goog/honeycomb-mr2'"