Make the SQL dialect for supported queries explcit

Change-Id: Ic5592a36c354384a9dbd63e72c4dbfae975b33d4
Merge "Make the SQL dialect for supported queries explcit" into release-0.11