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

* commit '9449bd618d7eb3cb0493f82b70ec556214da8ead':
  Fix clang compiler warning.