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

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