Merge remote branch 'goog/honeycomb' into honeycomb-mr1
tree: 458970f0c1286dacfc03c750681be77a702aa058
  1. tests/