am a4ea7c9d: am 69dff541: Merge "avoid stopping app in case of accessing empty db"

* commit 'a4ea7c9d0811080d318cdd712582038a91699459':
  avoid stopping app in case of accessing empty db