Merge "Fixes query logic when not instant" into rvc-dev am: f114613079

Change-Id: If0cc62f5c2f2993385f2b4c862369d95e1155eab