am 08cdf6fd: am 940df6dd: Merge "Remove unused API" into honeycomb

* commit '08cdf6fd9ac9bbbd77024518c45034d66b5830c6':
  Remove unused API