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

Change-Id: I5bddc3a272a637c8c5a158a7d871087929075213