Merge "initial accessibility class commit" into ics-mr1