Merge "Fix the build." into honeycomb