am 84ace50d: am 37099a08: Merge "TIF: Minor code improvement" into mnc-dev

* commit '84ace50d1944210c703bc0dffc70085ff9d0968e':
  TIF: Minor code improvement