am 3c6ee5b5: am d2bec096: Merge "NullPointerException in SQLiteSession"

# By László Dávid
# Via Android Git Automerger (1) and others
* commit '3c6ee5b509d6360a431290fff4b366848c293899':
  NullPointerException in SQLiteSession