am 0c2a6d76: Merge "ART: Fix another potential N-th visitor issue" into lmp-dev

* commit '0c2a6d76ccedb77e79adc68c723cd4ed8278fee9':
  ART: Fix another potential N-th visitor issue