add query for six issue

Related-Bug: #1276242

Change-Id: I2fa8b6cc1cca68d2680b3810d60ce9fb94995c32
Merge "add query for six issue"