Merge "Avoid "Incorrect user-level lock name " errors in Database lock() method"