am 2af72de8: Merge "Remove ThrowLocation."

* commit '2af72de83957fb52426b8f9144e9814d35b78951':
  Remove ThrowLocation.