am e646f943: am ca7b1210: am ea56499d: Merge "Potential NPE in SQLiteConnection"

# By Sylvain Becuwe
# Via Android Git Automerger (2) and others
* commit 'e646f943fd7c4f9d81a4f2fb4de153a2ad9fd8bc':
  Potential NPE in SQLiteConnection