Merge "QS: Fix accidental a11y tile removal" into nyc-mr1-dev am: 797b658428
am: 59b4e83168

Change-Id: Ie1b5a06e5bbb977b2671cf046f0b8528b77dda1c