Update for lock/unlock APIs

Reviewers: mike, gavin

Subscribers: ben

Differential Revision: http://phabricator.bitgo.com/D221