am aaae0573: am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown."

* commit 'aaae0573bb537b9de89c0410b9386e8f96c3568b':
  Releasing lock even if exception is thrown.