Merge "Fix documentation typo." into honeycomb