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

Change-Id: Ia562b52fff2f6efa4355b9d6ffe8af67fd845b98