Merge "Refactoring accessibility class out to own file."