Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2
tree: 32d1f4896c6b6da3ec8d14a3977306058058af75
  1. tests/