Merge "Fix QS accessibility issues" into nyc-dev am: 97e4c5e
am: 32e9ebe

* commit '32e9ebe7223ddc92a302fd6cbc53b8ce55fb4845':
  Fix QS accessibility issues

Change-Id: Ibb1c4838412d72c4e9f259ce1f75f7c9f6b92078