am 23b39217: am ce8697f8: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1

* commit '23b39217a5132bcf2cce94e98fbd486744f69958':