Fix clang warning.

Change-Id: If942dd6e6382d15c4839591f4f0860cb3cd19d31
Merge topic 'live-breakpoint' into next

24968b93 Fix clang warning.