Merge "QS Edit: Fix up accessibility" into nyc-dev
am: c4b6e2a184

* commit 'c4b6e2a1849690a7f8dfa3be75ee84f1453f8224':
  QS Edit: Fix up accessibility

Change-Id: Id83e89c55111b47de3fd641056d06db77c9b9006