Merge "Fix build." into honeycomb