am c31f6b96: am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1

* commit 'c31f6b96bd8e9d91085e862313f63a73c356516e':