am 48d160dd: Merge change 3228 into donut

Merge commit '48d160dd89a009bfbc30ba3751850a8c4dd96cf6'

* commit '48d160dd89a009bfbc30ba3751850a8c4dd96cf6':
  ADT: make sure to log exceptions that might happen when