am 8efd5951: am 369e88b6: am b40933de: Merge "TIF: Convert fields to local variables" into mnc-dev

* commit '8efd5951efa3f20fdf12713ecdd29271c7c0330b':
  TIF: Convert fields to local variables