Merge "Make SQLiteDirectCursorDriver @TestApi" into oc-mr1-dev