am f0829786: am 7d6ac1eb: Merge "TIF: Removed an unused variable" into lollipop-mr1-cts-dev

* commit 'f08297867df5c6ac22ebf2d764080faf20bb6d28':
  TIF: Removed an unused variable