am 5cd9e3b1: (-s ours) Revert "Always enable lock level checks." DO NOT MERGE * commit '5cd9e3b122f276f610980cbaf0d2ad6ed4cd9088': Revert "Always enable lock level checks." DO NOT MERGE