am 4a492dea: Merge "Fixing accessibility CTS tests." into jb-mr2-dev

* commit '4a492deacc64c8674f70b60f3c1c70d2aa09dd67':
  Fixing accessibility CTS tests.