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

Change-Id: If0b3a8caf1563fdcf25f8d38e3b5c6b1d183e3a2