Merge "Fix QS edit accessibility" into nyc-dev am: c665a3d4e9
am: ce8c21683d
* commit 'ce8c21683d31b9dfc48667db33bfdb22d656972d':
Change-Id: I13c0ee827e542affd9a941c99b1af286d9bbcb83
This commit is contained in: