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

* commit 'a66532e73a9c8205002482477f1bf53366d15f38':
  Fix some clang compilation issues.