am 1c96028f: Merge "Ignoring specific db exception to workaround Bug. 18554839." into ub-now-queens

* commit '1c96028f414f904b90c1a180a537021a6a3eceff':
  Ignoring specific db exception to workaround Bug. 18554839.