am d2bec096: Merge "NullPointerException in SQLiteSession"

# By László Dávid
# Via Gerrit Code Review (1) and László Dávid (1)
* commit 'd2bec0960d04578182905b34795c6895760944dd':
  NullPointerException in SQLiteSession