More db stuff changes

Change-Id: I6aeb08dee3a8e1c25bc7ddf82abf44bf6de37d96