Add query for bug 1225024

Change-Id: Id98851ae4b4271e9eb00b6843e371551486a1fbf
Merge "Add query for bug 1225024"