Merge "Remove unused API" into honeycomb