Merge "Android Design" into ics-mr1