Update query for Bug #1365046

The Change Id Ibb3269a534d5b28b2d7d8a531e30a77ba6011f2d added a more
specific message which help us to cover this bug more accurately.

Change-Id: I942c2884d75eb138e9646198266fad61d080c8f7
Related-Bug: #1365046
Merge "Update query for Bug #1365046"