Merge changes from topic 'slow_log'
am: 2369b1eb80

Change-Id: Ib714a9e9cd22bca570399604a2b4ea3d6cfe9ed3