Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
am: 3102245b62

Change-Id: I0997e70779456c1181d7750c1daa539afbc8dc0e