Merge "Add support for arcs." into honeycomb