Merge "Allow using SQLiteGlobal for testing" into oc-mr1-dev