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

Change-Id: I70ebf8d1c7ed2f9a5e3be5973aaeec5c229b018c