Merge "Sonar issue fix in LockCleanUpDaemon"