Merge "Fix slow query log." into qt-dev am: dee07f5d7f
am: 231b70ce96

Change-Id: Ia45192af629f2bd695b8c21240e7935bfd7220c5