Merge "Fix one static analyzer warning."
am: 63728630cb

* commit '63728630cb507e1b797eafb6b22cc0720684b87c':
  Fix one static analyzer warning.