Merge "doc typo" into honeycomb-mr2