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

* commit '7e878a10b7052d43dd55ef58092ea35285fffde5':
  TIF: Separate service connection errors from recording errors