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

* commit '97e4c5e6077a631aba1b87a8bae3bcfc2df2cadb':
  Fix QS accessibility issues

Change-Id: I02bf26ebbc7e271c0eb862b9373734ac1c65014a