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

Change-Id: I19c84eb6740e870c2974585fd3730d4d1e89c776