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

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

Change-Id: I470dac004836e4bb68ecf282e5b43af6c675e490