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

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

Change-Id: I78ebafd7f118fc1220e1c76b0823d229a69ebd0f