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

Change-Id: I54c4c7641417700eabb635dd72fd4b3dc47a583d