am b871a15f: Merge "ART: Add entries_ lock for race condition"

* commit 'b871a15f1f662c8efe10d41199180bd00b6decd1':
  ART: Add entries_ lock for race condition