Merge \\"Fix QS edit view accessibility classes\\" into nyc-dev am: 0809964452
am: a78fd8a31b

Change-Id: Ie9d5104114bed9df986e0b0dc39cc837c7f01bba