Merge "Revert "Handle a special case of lock aliasing during lock verification""