am 8386e134: Merge "Fix clang compiler warning."

* commit '8386e134be39e94f2856ed317d86172ea51edd3c':
  Fix clang compiler warning.