QS - Fix race condition in accessibility am: acf90acf13
am: 0e8ba6fd74

Change-Id: I8dc6a15ed67fd3cabceb52c7fd9cb0d06e5a5732