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

Change-Id: I8e67e103f2ce19204e8f6c7c940f10ed535dc48a