Avoid infinite recursion when purging access queue (#12310)

Change-Id: Id5029f6606ce508c5746af4e0fa3078283f511bf
No-op merge from origin/7.1

2ff71f6 Avoid infinite recursion when purging access queue (#12310)

Change-Id: I53db81b236b1141b7259c27021fd1da62fb62ec2