Merge changes from topic 'slow_log' am: 2369b1eb80 am: b00b28ab9c
am: a24dde686a

Change-Id: I69e99e9a4351fc143d5da2fa23e4b13d6fbbc5a8