Track sqlite back from CM again

Change-Id: I2d1fd16d5c45f6cbbbf66c0f9a0acbcc4b09ef96