Make dbstore1002 handle s5 analytics queries

Bug: 66068
Change-Id: Ia620342cc56b31ccedc25d5d9686833895cd7c60