Attempt to eliminate a link error.

Change-Id: I693f2148192ab0d069951fc308ee2c589d3742b4
Merge topic '10958_query_seln_over_time' into next

009a0f2 Attempt to eliminate a link error.