Merge remote branch 'goog/honeycomb' into honeycomb-mr1
tree: 03c14c321a68ddc04685e68c0a53045747a33085
  1. tests/