Try again to fix link errors.

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

7241ed6 Try again to fix link errors.