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

Change-Id: I844f0f7f265c7831cf45b8ddf6755f42aa35ee13