am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev

* commit '25466e0a8f3e0f7f1e758642519f3aa8643f6f26':
  TIF: throw an exception if an operation takes too long.