Merge "Allow using SQLiteGlobal for testing" into oc-mr1-dev
am: 347eaf21fa

Change-Id: I664b887cced9b328227c6ad053463e426c316fd8