Merge "TIF: Separate service connection errors from recording errors" into nyc-dev
am: d0e47d0aef

* commit 'd0e47d0aef55d203fc67df4aa64cfb70b46022ea':
  TIF: Separate service connection errors from recording errors