Add query for bug 1235435

Change-Id: Ie80d72872ffbf1f256c30786a04ac7aa0b67b3aa
Merge "Add query for bug 1235435"