am 02509457: Avoid db exception on L and above

* commit '0250945759f7ac58aab912448d62dc108b1770c5':
  Avoid db exception on L and above