Merge "If we want to release the lock, release instead of acquiring it." into nyc-dev am: 3395ed14
am: 8bf26cec
* commit '8bf26cec':
If we want to release the lock, release instead of acquiring it.
Change-Id: I88eb2adcdf59fbd6dd508e33c3d6de587c1a31a9