Fix Lock before Unlock

Change-Id: I9be273f9987cdecf4252f10426a1f62d580ddfd9
Merge pull request #9 from PAC-man/cm-10.2

Fix Lock before Unlock