Fix compile error on Linux.

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

8d8e922 Fix compile error on Linux.