Fix Lock before unlock

Change-Id: I5c45bfe6870f98a158f4070818d0590d52873fb6
Merge "Fix Lock before unlock" into du44