Merge "Allocate interrupted exception before re-acquiring lock"
am: 3d63118460

* commit '3d63118460dbcff330cb188ea86bd5ad5cda5f99':
  Allocate interrupted exception before re-acquiring lock