More link errors.

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

711312e More link errors.