am 91baad56: Merge "Fix some clang compilation issues."

* commit '91baad56f39fb77a4d07a0930c8743ebc61d7c0a':
  Fix some clang compilation issues.