am d75383af: am 5e8a63ae: Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev

* commit 'd75383af2f0843ecd2f493fd64b4eb38630c6071':
  ART: Do not recursively abort when visiting locks in a bad state