Bug 28375 - [post-p7] un-revert g2dc0c3d commit (lock/unlock)

Summary: [post-p7] un-revert g2dc0c3d commit (lock/unlock)