Refatoring a bit of accessibility code

Change-Id: I4df1741b622b21176c10311da0dc6347ca6fb390
2 files changed