Merge "fix race condition between addCleanup and lockutils"