Fix race condition that might leave access queue unpurged (#12277)

Merge: no
Change-Id: Iee1012486906d8c2c46cef94cfcd6d2b399d7a6b
No-op merge from origin/7.1

3a373ef Fix race condition that might leave access queue unpurged (#12277)

Change-Id: I58c3bcadb413b8c0dd0e9d687a995c5ee1d10de6