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

Change-Id: I89b1855c0653c5c87876277d9aba79dbeb4b5905