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

Change-Id: Icafd99613e3267e4db1e83ca5bf053a119822651