Merge "ART: Curb lock-verification-failure spam" am: d64842cc44
am: 54a7530877

* commit '54a75308777ed6e22ea6d1e6ee8a9872ccd713ff':
  ART: Curb lock-verification-failure spam