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