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