Merge "ART: Make less lock-level noise on abort" am: 2888e85164
am: a41f563e62

Change-Id: I099770d25ac0e2105cb3cc91407b0ac1b4fc0297