Merge "Fix memory leak warning in FwdLockEngine.cpp" am: 809ea9d9cc
am: b5c1bcb963

Change-Id: Ibe3b720e58ef87eaa0c30bd9052e752fbf363fbc