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

Change-Id: I96e48d61b6a2c98ad30a0760466fe6ffe9007b9c