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

* commit '940df6dd83624e5f46b147837d848853a1dab9b2':
  Remove unused API