Merge "QS - Fix race condition in accessibility" into nyc-mr2-dev
am: f39f98f562

Change-Id: Idf706cf94602615e746fe51c8ac17acde4258829