Work on SQLStore setup

Change-Id: I9d6b5e39a07f74450deacfb8522be3c0ed56c7b5
Merge "Work on SQLStore setup"