Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev