Merge "Fix typo" into honeycomb