DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition
am: d7ec6c9c59  -s ours

* commit 'd7ec6c9c59aab205a1e90fd1db3f98431e983dfd':
  DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition

Change-Id: Ida3953705286386634d27d00ceef540090ecc533