changed service to use proto-datastore
fixed build errors on android client