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

Change-Id: Ifb594d26308d054d313ec8980c0692fbdd203fbd