Merge "TIF: Handle possible memory leaks" into nyc-dev
am: cea42f6353

* commit 'cea42f63536f637ad17ad2706cfee3164b576438':
  TIF: Handle possible memory leaks

Change-Id: I0eed1df8c4cc565b58701404d0c5bd44225e7737