Merge "Revert "Use asynchronous lock/unlock API""