Merge "Doc change: typo fix" into honeycomb-mr1