Merge "docs: Android Design typo and grammar fixes" into ics-mr1