Merge "API Review update for SQLiteDatabase" into oc-mr1-dev