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

Change-Id: I0819f276018c9c9d50fe51c834c6356dad02c87e