Merge "TIF: More annotations" into nyc-dev am: a38b4ef
am: d3e9311

* commit 'd3e93119a0e52b0fe0046b47eee7c2f5613c8113':
  TIF: More annotations

Change-Id: Ica3a63d8d4c687b3df02a97c10cfbe6f99c30c6a