Merge "Fix memory leak warning in FwdLockEngine.cpp"