Initial merge from Eyes-Free/AccessCheck project Change-Id: Ib0cbc361b7de0e0f27c5f636b9cf8b56fbbb8751