am 6452c259: Merge "Remove tests for dead API." into honeycomb

* commit '6452c259e0547bcb5aede8d52e1307ee8cf86d89':
  Remove tests for dead API.